From 96a91522c7bd3eb1736319262635b95dc2f90995 Mon Sep 17 00:00:00 2001 From: Alex Williamson Date: Thu, 31 May 2007 14:47:08 -0600 Subject: [PATCH] [IA64] Fix initialization order for buddy allocator Fix initialization order of buddy allocator to avoid panic on machines with multi NUMA node. Signed-off-by: Daisuke Nishimura --- xen/arch/ia64/linux-xen/setup.c | 14 +++++++------- xen/arch/ia64/xen/xensetup.c | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/xen/arch/ia64/linux-xen/setup.c b/xen/arch/ia64/linux-xen/setup.c index 153fc58c9e..b7f9a0d0ef 100644 --- a/xen/arch/ia64/linux-xen/setup.c +++ b/xen/arch/ia64/linux-xen/setup.c @@ -506,13 +506,6 @@ setup_arch (char **cmdline_p) if (early_console_setup(*cmdline_p) == 0) mark_bsp_online(); -#ifdef XEN -} - -void __init -late_setup_arch (char **cmdline_p) -{ -#endif #ifdef CONFIG_ACPI_BOOT /* Initialize the ACPI boot-time table parser */ acpi_table_init(); @@ -525,6 +518,13 @@ late_setup_arch (char **cmdline_p) # endif #endif /* CONFIG_APCI_BOOT */ +#ifdef XEN +} + +void __init +late_setup_arch (char **cmdline_p) +{ +#endif #ifndef XEN find_memory(); #endif diff --git a/xen/arch/ia64/xen/xensetup.c b/xen/arch/ia64/xen/xensetup.c index d40976b46d..2f1fbb9fc8 100644 --- a/xen/arch/ia64/xen/xensetup.c +++ b/xen/arch/ia64/xen/xensetup.c @@ -433,13 +433,13 @@ void __init start_kernel(void) alloc_dom0(); - end_boot_allocator(); - init_xenheap_pages(__pa(xen_heap_start), xenheap_phys_end); printk("Xen heap: %luMB (%lukB)\n", (xenheap_phys_end-__pa(xen_heap_start)) >> 20, (xenheap_phys_end-__pa(xen_heap_start)) >> 10); + end_boot_allocator(); + late_setup_arch(&cmdline); scheduler_init(); -- 2.30.2